It's pixbuf_pos, not pixbufpos.

2001-04-12  Anders Carlsson  <andersca@codefactory.se>

	* gtk/gtkcellrenderertextpixbuf.c (gtk_cell_renderer_text_pixbuf_class_init): It's pixbuf_pos,
	not pixbufpos.

	* gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_render): Fix small typo.

	* gtk/gtkcellrenderer.c (gtk_cell_renderer_get_property): xpad and ypad
	are unsigned insts, therefore use g_value_set_uint.
	(gtk_cell_renderer_set_property): Likewise, use g_value_get_uint.

diff --git a/ChangeLog b/ChangeLog
index 30cba023ac1acb25d823154c2d50b73dfe1738b2..9b3281f5c406887e3857423a30fdbb3c7684d08e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2001-04-12  Anders Carlsson  <andersca@codefactory.se>
+
+       * gtk/gtkcellrenderertextpixbuf.c (gtk_cell_renderer_text_pixbuf_class_init): It's pixbuf_pos,
+       not pixbufpos.
+
+       * gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_render): Fix small typo.
+
+       * gtk/gtkcellrenderer.c (gtk_cell_renderer_get_property): xpad and ypad
+       are unsigned insts, therefore use g_value_set_uint.
+       (gtk_cell_renderer_set_property): Likewise, use g_value_get_uint.
+
 Sun Apr  8 05:36:06 2001  Jonathan Blandford  <jrb@webwynk.net>
 
        * gtk/gtktextview.c (gtk_text_view_class_init): fix a fixme.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 30cba023ac1acb25d823154c2d50b73dfe1738b2..9b3281f5c406887e3857423a30fdbb3c7684d08e 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,14 @@
+2001-04-12  Anders Carlsson  <andersca@codefactory.se>
+
+       * gtk/gtkcellrenderertextpixbuf.c (gtk_cell_renderer_text_pixbuf_class_init): It's pixbuf_pos,
+       not pixbufpos.
+
+       * gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_render): Fix small typo.
+
+       * gtk/gtkcellrenderer.c (gtk_cell_renderer_get_property): xpad and ypad
+       are unsigned insts, therefore use g_value_set_uint.
+       (gtk_cell_renderer_set_property): Likewise, use g_value_get_uint.
+
 Sun Apr  8 05:36:06 2001  Jonathan Blandford  <jrb@webwynk.net>
 
        * gtk/gtktextview.c (gtk_text_view_class_init): fix a fixme.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 30cba023ac1acb25d823154c2d50b73dfe1738b2..9b3281f5c406887e3857423a30fdbb3c7684d08e 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,14 @@
+2001-04-12  Anders Carlsson  <andersca@codefactory.se>
+
+       * gtk/gtkcellrenderertextpixbuf.c (gtk_cell_renderer_text_pixbuf_class_init): It's pixbuf_pos,
+       not pixbufpos.
+
+       * gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_render): Fix small typo.
+
+       * gtk/gtkcellrenderer.c (gtk_cell_renderer_get_property): xpad and ypad
+       are unsigned insts, therefore use g_value_set_uint.
+       (gtk_cell_renderer_set_property): Likewise, use g_value_get_uint.
+
 Sun Apr  8 05:36:06 2001  Jonathan Blandford  <jrb@webwynk.net>
 
        * gtk/gtktextview.c (gtk_text_view_class_init): fix a fixme.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 30cba023ac1acb25d823154c2d50b73dfe1738b2..9b3281f5c406887e3857423a30fdbb3c7684d08e 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,14 @@
+2001-04-12  Anders Carlsson  <andersca@codefactory.se>
+
+       * gtk/gtkcellrenderertextpixbuf.c (gtk_cell_renderer_text_pixbuf_class_init): It's pixbuf_pos,
+       not pixbufpos.
+
+       * gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_render): Fix small typo.
+
+       * gtk/gtkcellrenderer.c (gtk_cell_renderer_get_property): xpad and ypad
+       are unsigned insts, therefore use g_value_set_uint.
+       (gtk_cell_renderer_set_property): Likewise, use g_value_get_uint.
+
 Sun Apr  8 05:36:06 2001  Jonathan Blandford  <jrb@webwynk.net>
 
        * gtk/gtktextview.c (gtk_text_view_class_init): fix a fixme.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 30cba023ac1acb25d823154c2d50b73dfe1738b2..9b3281f5c406887e3857423a30fdbb3c7684d08e 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,14 @@
+2001-04-12  Anders Carlsson  <andersca@codefactory.se>
+
+       * gtk/gtkcellrenderertextpixbuf.c (gtk_cell_renderer_text_pixbuf_class_init): It's pixbuf_pos,
+       not pixbufpos.
+
+       * gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_render): Fix small typo.
+
+       * gtk/gtkcellrenderer.c (gtk_cell_renderer_get_property): xpad and ypad
+       are unsigned insts, therefore use g_value_set_uint.
+       (gtk_cell_renderer_set_property): Likewise, use g_value_get_uint.
+
 Sun Apr  8 05:36:06 2001  Jonathan Blandford  <jrb@webwynk.net>
 
        * gtk/gtktextview.c (gtk_text_view_class_init): fix a fixme.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 30cba023ac1acb25d823154c2d50b73dfe1738b2..9b3281f5c406887e3857423a30fdbb3c7684d08e 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,14 @@
+2001-04-12  Anders Carlsson  <andersca@codefactory.se>
+
+       * gtk/gtkcellrenderertextpixbuf.c (gtk_cell_renderer_text_pixbuf_class_init): It's pixbuf_pos,
+       not pixbufpos.
+
+       * gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_render): Fix small typo.
+
+       * gtk/gtkcellrenderer.c (gtk_cell_renderer_get_property): xpad and ypad
+       are unsigned insts, therefore use g_value_set_uint.
+       (gtk_cell_renderer_set_property): Likewise, use g_value_get_uint.
+
 Sun Apr  8 05:36:06 2001  Jonathan Blandford  <jrb@webwynk.net>
 
        * gtk/gtktextview.c (gtk_text_view_class_init): fix a fixme.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 30cba023ac1acb25d823154c2d50b73dfe1738b2..9b3281f5c406887e3857423a30fdbb3c7684d08e 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,14 @@
+2001-04-12  Anders Carlsson  <andersca@codefactory.se>
+
+       * gtk/gtkcellrenderertextpixbuf.c (gtk_cell_renderer_text_pixbuf_class_init): It's pixbuf_pos,
+       not pixbufpos.
+
+       * gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_render): Fix small typo.
+
+       * gtk/gtkcellrenderer.c (gtk_cell_renderer_get_property): xpad and ypad
+       are unsigned insts, therefore use g_value_set_uint.
+       (gtk_cell_renderer_set_property): Likewise, use g_value_get_uint.
+
 Sun Apr  8 05:36:06 2001  Jonathan Blandford  <jrb@webwynk.net>
 
        * gtk/gtktextview.c (gtk_text_view_class_init): fix a fixme.

diff --git a/gtk/gtkcellrenderer.c b/gtk/gtkcellrenderer.c
index 474275fda7d3e6006067257b337b4d280ec89f7e..69e4711ec6ae41c0de4cca689643ee1e593e2321 100644 (file)
--- a/gtk/gtkcellrenderer.c
+++ b/gtk/gtkcellrenderer.c
@@ -181,10 +181,10 @@ gtk_cell_renderer_get_property (GObject     *object,
       g_value_set_float (value, cell->yalign);
       break;
     case PROP_XPAD:
-      g_value_set_float (value, cell->xpad);
+      g_value_set_uint (value, cell->xpad);
       break;
     case PROP_YPAD:
-      g_value_set_float (value, cell->ypad);
+      g_value_set_uint (value, cell->ypad);
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
@@ -220,11 +220,11 @@ gtk_cell_renderer_set_property (GObject      *object,
       g_object_notify (object, "yalign");
       break;
     case PROP_XPAD:
-      cell->xpad = g_value_get_int (value);
+      cell->xpad = g_value_get_uint (value);
       g_object_notify (object, "xpad");
       break;
     case PROP_YPAD:
-      cell->ypad = g_value_get_int (value);
+      cell->ypad = g_value_get_uint (value);
       g_object_notify (object, "ypad");
       break;
     default:

diff --git a/gtk/gtkcellrendererpixbuf.c b/gtk/gtkcellrendererpixbuf.c
index 36ead4e08b1c2a8d9c62bd707bc1aae6c9a8e699..0bb2cb8c9065b918e7f22ed668fbe89961845e24 100644 (file)
--- a/gtk/gtkcellrendererpixbuf.c
+++ b/gtk/gtkcellrendererpixbuf.c
@@ -245,7 +245,7 @@ gtk_cell_renderer_pixbuf_render (GtkCellRenderer    *cell,
 
   gtk_cell_renderer_pixbuf_get_size (cell, widget, cell_area,
                                     &pix_rect.x,
-                                    &pix_rect.x,
+                                    &pix_rect.y,
                                     &pix_rect.width,
                                     &pix_rect.height);
   pix_rect.x += cell_area->x;

diff --git a/gtk/gtkcellrenderertextpixbuf.c b/gtk/gtkcellrenderertextpixbuf.c
index 62da0d6c73b236a0d8f3e5d51c508cf394bc829a..c003f4e5672db99ef70f073e8d4a09d9acbd0958 100644 (file)
--- a/gtk/gtkcellrenderertextpixbuf.c
+++ b/gtk/gtkcellrenderertextpixbuf.c
@@ -110,7 +110,7 @@ gtk_cell_renderer_text_pixbuf_class_init (GtkCellRendererTextPixbufClass *class)
   
   g_object_class_install_property (object_class,
                                   PROP_PIXBUF_POS,
-                                  g_param_spec_int ("pixbufpos",
+                                  g_param_spec_int ("pixbuf_pos",
                                                     _("Pixbuf location"),
                                                     _("The relative location of the pixbuf to the text."),
                                                     GTK_POS_LEFT,